From: Katsumi Yamaoka <katsumi@flagship2>
Date: Thu, 6 May 2010 12:51:40 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~69
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5fcdbba6ce3c493ba6becc6a50d43c2f3e2f69e1;p=emacs.git

Merge from mainline.
---

5fcdbba6ce3c493ba6becc6a50d43c2f3e2f69e1